gnomeos: Some tweaks to image content

diff --git a/gnomeos/yocto/gnomeos-run.sh b/gnomeos/yocto/gnomeos-run.sh
index 5fbc01ca1c5fc7b982ba87cb45fef4fe6ace65d8..d105a941cb58431161ebae9ab904b4db907da1bc 100755 (executable)
--- a/gnomeos/yocto/gnomeos-run.sh
+++ b/gnomeos/yocto/gnomeos-run.sh
@@ -89,4 +89,4 @@ if ! echo $ARGS | grep -q 'ostree='; then
     ARGS="ostree=current $ARGS"
 fi
 
-exec qemu-kvm -kernel ./tmp/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -append "$ARGS"
+exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -append "$ARGS"

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb b/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
index abe5d63c1f012043015ef2b8885237a0a6440929..63b661b053fe0fdb94b96757649a1b2564cf8616 100644 (file)
--- a/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
@@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit rootfs_${IMAGE_PKGTYPE}
 
-PACKAGE_INSTALL = "task-core-boot task-base-extended \
-                  ostree ostree-init strace"
+PACKAGE_INSTALL = "task-core-boot \
+                  coreutils \
+                  ostree ostree-init \
+                  strace"
+
 RDEPENDS += "${PACKAGE_INSTALL}"
 DEPENDS += "makedevs-native virtual/fakeroot-native"
 
@@ -34,9 +37,6 @@ fakeroot do_rootfs () {
 
        rootfs_${IMAGE_PKGTYPE}_do_rootfs
 
-       makedevs -r ${IMAGE_ROOTFS} -D ${@gnomeos_get_devtable_list(d)}
-       mkdir ${IMAGE_ROOTFS}/dev/pts
-
        # We use devtmpfs
        rm -f ${IMAGE_ROOTFS}/etc/init.d/udev-cache
        rm -f ${IMAGE_ROOTFS}/etc/rc*.d/*udev-cache*
@@ -49,7 +49,6 @@ sysfs                   /sys                    sysfs   defaults        0 0
 proc                    /proc                   proc    defaults        0 0
 EOF
 
-       echo "GNOME OS Unix login" > ${IMAGE_ROOTFS}/etc/issue
 
        ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf
 
@@ -68,8 +67,6 @@ EOF
        for d in $READONLY_BIND_MOUNTS; do
             mv ${IMAGE_ROOTFS}/$d .
        done
-       # Also copy over any static /dev contents for now
-       mv ${IMAGE_ROOTFS}/dev .
        rm -rf ${IMAGE_ROOTFS}
        mv ${WORKDIR}/gnomeos-contents ${IMAGE_ROOTFS}